From 5493cc2a7008839ac88816cd5a7c49b863a8c828 Mon Sep 17 00:00:00 2001 From: "lynx@idefix.cl.cam.ac.uk" Date: Wed, 18 Dec 2002 11:11:24 +0000 Subject: [PATCH] bitkeeper revision 1.7.3.29 (3e0057dct07YJyI_VLJkzk0OZIVBow) erasing debug msgs --- .../arch/xeno/drivers/dom0/dom0_core.c | 18 ------------------ .../arch/xeno/drivers/dom0/dom0_memory.c | 10 ---------- 2 files changed, 28 deletions(-) diff --git a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c index cd81b61c55..9a97dcb1a3 100644 --- a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c +++ b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c @@ -148,15 +148,11 @@ static void create_proc_dom_entries(int dom) static ssize_t dom_mem_write(struct file * file, const char * buff, size_t size , loff_t * off) { - printk(KERN_ALERT "bd240 debug: dom_mem_write invoked!\n"); - unsigned long addr; proc_memdata_t * mem_data = (proc_memdata_t *)((struct proc_dir_entry *)file->f_dentry->d_inode->u.generic_ip)->data; copy_from_user(&addr, (unsigned long *)buff, sizeof(addr)); - printk(KERN_ALERT "bd240 debug: dom_mem_write addr %lx\n", addr); - if(direct_disc_unmap(addr, mem_data->pfn, mem_data->tot_pages) == 0){ return sizeof(addr); } else { @@ -169,15 +165,11 @@ static ssize_t dom_mem_read(struct file * file, char * buff, size_t size, loff_t unsigned long addr; pgprot_t prot; - printk(KERN_ALERT "bd240 debug: dom_mem_read invoked!\n"); - proc_memdata_t * mem_data = (proc_memdata_t *)((struct proc_dir_entry *)file->f_dentry->d_inode->u.generic_ip)->data; prot = PAGE_SHARED; /* remap the range using xen specific routines */ - printk(KERN_ALERT "bd240 debug: mem_read: mem_data %lx\n", mem_data); - addr = direct_mmap(mem_data->pfn << PAGE_SHIFT, mem_data->tot_pages << PAGE_SHIFT, prot, 0, 0); //addr = direct_mmap(mem_data->pfn, mem_data->tot_pages << PAGE_SHIFT, prot, 1, // mem_data->tot_pages); @@ -194,15 +186,11 @@ struct file_operations dom_mem_ops = { static int dom_map_mem(unsigned int dom, unsigned long pfn, int tot_pages) { - printk(KERN_ALERT "bd240 debug: dom_map_mem: invoked\n"); - int ret = -ENOENT; struct proc_dir_entry * pd = xeno_base->subdir; struct proc_dir_entry * file; proc_memdata_t * memdata; - printk(KERN_ALERT "bd240 debug: dom_map_mem invoked, xeno_base %lx, subdir %lx\n", xeno_base, xeno_base->subdir); - while(pd != NULL){ if((pd->mode & S_IFDIR) && ((dom_procdata_t *)pd->data)->domain == dom){ @@ -227,8 +215,6 @@ static int dom_map_mem(unsigned int dom, unsigned long pfn, int tot_pages) memdata->tot_pages = tot_pages; file->data = memdata; - printk(KERN_ALERT "bd240 debug: associated memdata with proc, memdata %lx, pfn %lx, tot_pages %lx\n", file->data, memdata->pfn, memdata->tot_pages); - ret = 0; break; } @@ -289,8 +275,6 @@ static int cmd_write_proc(struct file *file, const char *buffer, } else { - printk(KERN_ALERT "bd240 debug: mapping dom %d, %lx, %lx\n", op.u.reqdommem.domain, op.u.reqdommem.start_pfn, op.u.reqdommem.tot_pages); - ret = dom_map_mem(op.u.reqdommem.domain, op.u.reqdommem.start_pfn, op.u.reqdommem.tot_pages); } @@ -366,8 +350,6 @@ static int __init init_module(void) /* set up /proc entries for dom 0 */ create_proc_dom_entries(0); - printk(KERN_ALERT "bd240 debug: task 1 addr %lx\n", find_task_by_pid(1)); - return 0; } diff --git a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c index 8d8f82c62f..1f2803314c 100644 --- a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c +++ b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c @@ -68,7 +68,6 @@ static inline void direct_remappte_range(pte_t * pte, unsigned long address, uns pte++; } while (address && (address < end)); - printk(KERN_ALERT "bd240 debug: exit from direct_remappte_range\n"); } static inline int direct_remappmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned long address, unsigned long size, @@ -182,14 +181,10 @@ unsigned long direct_mmap(unsigned long phys_addr, unsigned long size, dmmap->addr = addr; list_add(&dmmap->list, ¤t->mm->context.direct_list); - printk(KERN_ALERT "bd240 debug: direct_mmap: enlisting addr %lx\n", dmmap->addr); - /* and perform the mapping */ if(flag == MAP_DISCONT){ ret = direct_remap_disc_page_range(addr, phys_addr, tot_pages, prot); } else { - printk(KERN_ALERT "bd240 debug: addr %lx, phys_addr %lx, size %lx\n", - addr, phys_addr, size); ret = direct_remap_page_range(addr, phys_addr, size, prot); } @@ -227,7 +222,6 @@ static inline int direct_zap_pte_range(mmu_gather_t *tlb, pmd_t * pmd, unsigned if (pte_none(pte)) continue; freed ++; - printk(KERN_ALERT "bd240 debug: clearing ptr %lx\n", __pa(ptep) + start_info.phys_base); direct_pte_clear(ptep); } @@ -332,14 +326,10 @@ int direct_disc_unmap(unsigned long from, unsigned long first_pg, int tot_pages) struct list_head * curr; struct list_head * direct_list = ¤t->mm->context.direct_list; - printk(KERN_ALERT "bd240 debug: direct_disc_unmap: from %lx\n", from); - curr = direct_list->next; while(curr != direct_list){ node = list_entry(curr, direct_mmap_node_t, list); - printk(KERN_ALERT "bd240 debug: direct_disc_unmap: node %lx\n", node->addr); - if(node->addr == from) break; curr = curr->next; -- 2.30.2